From ac78218936a70cd3d90b64fbaad7fe39b97ed394 Mon Sep 17 00:00:00 2001 From: "kaf24@freefall.cl.cam.ac.uk" Date: Tue, 14 Sep 2004 22:07:33 +0000 Subject: [PATCH] bitkeeper revision 1.1159.76.1 (41476ba5rg4qFnlhUY3tth7mouxVQA) Use a better dummy rootdev in Linux 2.6, so we don't auto-dhcp when we shouldn't (David Becker). --- linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/setup.c b/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/setup.c index 22f1dab651..b225c26fad 100644 --- a/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/setup.c +++ b/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/setup.c @@ -1313,7 +1313,7 @@ void __init setup_arch(char **cmdline_p) efi_enabled = 1; #endif - ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV); + ROOT_DEV = MKDEV(RAMDISK_MAJOR,0); /*old_decode_dev(ORIG_ROOT_DEV);*/ drive_info = DRIVE_INFO; screen_info = SCREEN_INFO; edid_info = EDID_INFO; -- 2.30.2